Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[promtail] update to 3.0.0 #3083

Merged
merged 4 commits into from
Jun 8, 2024
Merged

[promtail] update to 3.0.0 #3083

merged 4 commits into from
Jun 8, 2024

Conversation

mjnagel
Copy link
Contributor

@mjnagel mjnagel commented Apr 16, 2024

Updates:

  • Promtail 3.0.0 (does not appear to be any chart changes needed?)
  • Switches configmap-reload to new ghcr location
  • Allows for enabling service without servicemonitor

Previously made these changes in https://github.com/grafana/helm-charts/pull/3026/files but with the 3.0.0 release moved them here.

@mjnagel
chore: promtail update
fe85838 
Signed-off-by: Micah Nagel <micah.nagel@defenseunicorns.com>
@mjnagel
Merge branch 'main' into promtail-chart-changes
4b3e9c7
@mjnagel
Copy link
Contributor Author

mjnagel commented May 30, 2024

@zanhsieh rebased this and fixed linting issues if you are able to take another look!

@jimmy-ungerman
Copy link

Would love to get this approved to match our Promtail installation to the Loki version

zalegrala
zalegrala approved these changes Jun 7, 2024
View reviewed changes
Copy link
Contributor

@zalegrala zalegrala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contribution.

@zanhsieh zanhsieh merged commit 0806507 into grafana:main Jun 8, 2024
6 checks passed
@jkroepke
Copy link
Contributor

@zalegrala @zanhsieh @mjnagel

This update introduces an invalid template. If Values.service.labels is empty, the template breaks.

---
# Source: opsstack/charts/promtail/templates/service-metrics.yaml

apiVersion: v1
kind: Service
metadata:
  name: release-name-promtail-metrics
  namespace: default
  labels:
    helm.sh/chart: promtail-6.16.0
    app.kubernetes.io/name: promtail
    app.kubernetes.io/instance: release-name
    app.kubernetes.io/version: "3.0.0"
    app.kubernetes.io/managed-by: Helm
    {}
  annotations:
    {}
spec:

results into an helm error:

Error: YAML parse error on opsstack/charts/promtail/templates/service-metrics.yaml: error converting YAML to JSON: yaml: line 11: did not find expected key

Use --debug flag to render out invalid YAML

@mjnagel
Copy link
Contributor Author

mjnagel commented Jun 10, 2024

@jkroepke I'll fix this shortly, thanks for bringing to my attention.

@mjnagel mjnagel mentioned this pull request Jun 10, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zanhsieh zanhsieh zanhsieh approved these changes

@zalegrala zalegrala zalegrala approved these changes

@unguiculus unguiculus Awaiting requested review from unguiculus unguiculus is a code owner

@Whyeasy Whyeasy Awaiting requested review from Whyeasy Whyeasy is a code owner

@mapno mapno Awaiting requested review from mapno

@swartz-k swartz-k Awaiting requested review from swartz-k

@BitProcessor BitProcessor Awaiting requested review from BitProcessor

@faustodavid faustodavid Awaiting requested review from faustodavid

@dgzlopes dgzlopes Awaiting requested review from dgzlopes

@maorfr maorfr Awaiting requested review from maorfr

@torstenwalter torstenwalter Awaiting requested review from torstenwalter

@Xtigyro Xtigyro Awaiting requested review from Xtigyro

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mjnagel @jimmy-ungerman @jkroepke @zanhsieh @zalegrala